merge trunk
authorKenichi Handa <handa@m17n.org>
Mon, 8 Nov 2010 05:19:24 +0000 (14:19 +0900)
committerKenichi Handa <handa@m17n.org>
Mon, 8 Nov 2010 05:19:24 +0000 (14:19 +0900)
commit95dcd69ad6bd5b6172d449bedb44826dd9c16530
tree9a8e6d66b5fcc14e8fe4d947469260c77b2c6e2e
parentdda4a814a09f1950464a4ee422e56370ebc764d1
parent0cba9d8da2d5ec9a231b479bf5592a13b34c2f1a
merge trunk